Added image reading function for runtime #577

yoya · 2019-10-30T05:22:28Z

Added image reading function for runtime.

Motivation and Context

In the runtime examples run.cpp,
I want to read the actual image, not the dummy random image.

Description

Added image reading function for runtime.

  Tensor Tensor_loadImage(std::string filename);

We can load images in npy format even if neither link external image library.
When linking libpng, PNG can be read.
If you link opencv, you can read the format that opencv can read.

How has this been tested?

reference (lmnet run.py)

$ cd blueoil/output_template/python
$ python run.py -m lib_x86.so -c meta.yaml -i raw_image.png
Output: (before post process)
[[1.0594523e-04 6.2350206e-05 3.2353133e-02 3.6062470e-03 1.2402927e-02
  2.3177502e-04 9.5100403e-01 8.7061970e-05 9.8417870e-05 4.8058930e-05]]
Output:
[[1.0594523e-04 6.2350206e-05 3.2353133e-02 3.6062470e-03 1.2402927e-02
  2.3177502e-04 9.5100403e-01 8.7061970e-05 9.8417870e-05 4.8058930e-05]]
save json: output/output.json
save image: output/images/raw_image.png

runtime (neither link image library)

$ cd blueoil/runtime
$ mkdir build ; cd build
$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake -DBUILD_SHARED_LIBS=ON ../
$ make install
$
$ cd ../examples
$ cp -R ../build/output/* ./
$ cmake .
$ make
$
$ ./a.out -i cat.npy -c meta.yaml
classes:
airplane
automobile
bird
cat
deer
dog
frog
horse
ship
truck
task: IMAGE.CLASSIFICATION
expected input shape:
1
32
32
3
Run
Results !
0.000105945
6.23502e-05
0.0323531
0.00360625
0.0124029
0.000231775
0.951004
8.7062e-05
9.84179e-05
4.80589e-05

runtime (with libpng)

$ cd ../build/
$ rm CMakeCache.txt
$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake -DBUILD_SHARED_LIBS=ON ../ -DUSE_LIBPNG=ON
$ make install
$
$ cd ../examples
$ cp -R ../build/output/* ./
$ rm CMakeCache.txt
$ cmake . -DUSE_LIBPNG=ON
$ make
$
$ ./a.out -i cat.png -c meta.yaml
classes:
airplane
automobile
bird
cat
deer
dog
frog
horse
ship
truck
task: IMAGE.CLASSIFICATION
expected input shape:
1
32
32
3
Run
Results !
0.000105945
6.23502e-05
0.0323531
0.00360625
0.0124029
0.000231775
0.951004
8.7062e-05
9.84179e-05
4.80589e-05

runtime (with opencv)

$ cd ../build/
$ rm CMakeCache.txt
$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake -DBUILD_SHARED_LIBS=ON ../ -DUSE_OPENCV=ON
$ make install
$
$ cd ../examples
$ cp -R ../build/output/* ./
$ rm CMakeCache.txt
$ cmake . -DUSE_OPENCV=ON
$ make
$
$ ./a.out -i cat.png -c meta.yaml
classes:
airplane
automobile
bird
cat
deer
dog
frog
horse
ship
truck
task: IMAGE.CLASSIFICATION
expected input shape:
1
32
32
3
Run
Results !
0.000105945
6.23502e-05
0.0323531
0.00360625
0.0124029
0.000231775
0.951004
8.7062e-05
9.84179e-05
4.80589e-05

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature / Optimization (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

My change requires a change to the documentation.
I have updated the documentation accordingly.

- command line: cmake => cmake . - sample path: /home/.../git/ => <repost_dir>

(mainly from tkng/emscripten branch.) - FormatYoloV2, NMS, - softmax, sigmoid, CalcIoU - ConvertBboxCoordinate, PerImageStandardization - etc. required Tensor functions.

TODO: copyright (all files)

(little modified examples/run.cpp, fitting to 80-chara width)

TODO: Missing username in TODO

…ries(opencv, libpng) installation situation. But, image readers(png,npy) not implemented yet.

delete randomImage (debug function)

replace it to GLOB & REMOVE_ITEM. for Cmake 3.5

- add npy, data_processor - del opencv. (require cmake option -DUSE_OPENCV=ON)

previously, display flatten array. non human readable.

…mread.

fix: comment space, include functional

tkng

Could you remove the binary file runtime/examples/dlk_lib/libdlk_x86.a?

runtime/src/blueoil_opencv.cpp

tkng · 2019-11-22T09:25:25Z

Other than the small comments above, LGTM.

add import dlk library procedure text to README.md

No longer represents imagedata, just data.

tkng

Thanks for your contribution, other than commented points, looks good to me.

runtime/examples/CMakeLists.txt

runtime/examples/run.cpp

- for (a ; b ;c) => for (a; b; c)

- change example executable name. a.out => run - modify bad style of parenthesis.

tkng

Thanks for your contribution! I'll merge the PR after unit test passed.

yoya and others added 30 commits July 16, 2019 22:01

fixing to README.md

a083bf2

- command line: cmake => cmake . - sample path: /home/.../git/ => <repost_dir>

Tensor dump layout refine.

01ae182

post-process implementation.

be30069

(mainly from tkng/emscripten branch.) - FormatYoloV2, NMS, - softmax, sigmoid, CalcIoU - ConvertBboxCoordinate, PerImageStandardization - etc. required Tensor functions.

enable to building without OpenCV.

fbf4c8d

apply google coding styles with cpplint check.

dd3a037

TODO: copyright (all files)

add copyright to src/include/test, cpp/hpp

86b185c

(little modified examples/run.cpp, fitting to 80-chara width)

apply google coding styles with cpplint check. examples/run.cpp

f17fb64

TODO: Missing username in TODO

Merge branch 'master' into dev/runtime/postprocess

a005d64

fixing to not work even if OpenCV enabled

242e182

Merge branch 'master' into dev/runtime/postprocess

d3a026b

add function Tensor_loadImage to blueoil namespace.

332b6e0

OpenCV default off, for examples/run.cpp

192e4a7

Merge branch 'dev/runtime/postprocess' into dev/runtime/readimage

691fc5e

Merge branch 'master' into dev/runtime/postprocess

f518f41

fixing to blueoil::image::LoadImage build failed without OpenCV.

efac9d3

Merge branch 'dev/runtime/postprocess' into dev/runtime/readimage

57f4f85

Merge branch 'master' into dev/runtime/readimage

199bee9

adding PNG library rules to runtime CMake

5949886

a mechanism that can read image files as possible depend on the libra…

b403b93

…ries(opencv, libpng) installation situation. But, image readers(png,npy) not implemented yet.

add NPY reader.

86eab04

add test for npy file reading

e833509

fix comment, function name.

33fa8ce

PNG image reader with libpng.

045bb5d

refine with cpplint

b6442e7

Merge branch 'master' into dev/runtime/readimage

4aff09c

use Tensor_loadImage function.

73d10f4

delete randomImage (debug function)

list(FILTER... was introduced in CMake 3.6.

97cf571

replace it to GLOB & REMOVE_ITEM. for Cmake 3.5

change link library target, "-lpthread" to pthread

dc8d123

fix build failed condition. USE_OPENCV=OFF & USE_LIBPNG=ON

73edb31

libpng, opencv support.

6faa87c

yoya added 3 commits October 30, 2019 13:42

change dlk examples something to classification/lmnet_quantize_cifar10

51c630e

update README a.out output log with the lmnet_quantize_cifar10 dlklib

cbd8813

Merge branch 'master' into dev/runtime/readimage

611f552

blueoil-butler bot added the CI: auto-run Run CI automatically label Oct 30, 2019

cat.png image (from cat.npy)

b9855b0

yoya changed the title ~~Dev/runtime/readimage~~ Added image reading function for runtime Oct 30, 2019

yoya added 5 commits November 6, 2019 13:12

Merge branch 'master' into dev/runtime/readimage

db7eb85

README update to make test current situation.

5455041

- add npy, data_processor - del opencv. (require cmake option -DUSE_OPENCV=ON)

improved run.cpp result output.

f8683c2

previously, display flatten array. non human readable.

Merge branch 'master' into dev/runtime/readimage

4b33fd9

let test_resize using blueoil::Tensor_loadImage, instead of opencv::i…

5fd7749

…mread.

iizukak requested a review from tkng November 20, 2019 02:01

yoya added 3 commits November 20, 2019 12:56

Merge branch 'master' into dev/runtime/readimage

90444ac

Let Tensor_fromNPYFile more generic function, not limited to image data.

1a947dc

cpplint check.

bb92228

fix: comment space, include functional

tkng reviewed Nov 22, 2019

View reviewed changes

runtime/src/blueoil_opencv.cpp Outdated Show resolved Hide resolved

yoya added 5 commits November 22, 2019 19:49

remove empty line between namespace keywords.

54f68cd

remove dlk_lib/libdlk_x86.a & meta.yaml

15130c1

add import dlk library procedure text to README.md

support float32 value in npy file.

efdc6e6

fix variable name. imagedata => data.

a5dd48d

No longer represents imagedata, just data.

change variable name. valuetype => datatype.

21688c9

tkng reviewed Nov 26, 2019

View reviewed changes

runtime/examples/CMakeLists.txt Outdated Show resolved Hide resolved

runtime/examples/CMakeLists.txt Outdated Show resolved Hide resolved

runtime/examples/run.cpp Outdated Show resolved Hide resolved

yoya and others added 3 commits November 26, 2019 15:10

fixing to coding style.

ac1e423

- for (a ; b ;c) => for (a; b; c)

refine CMakeList.txt

506e97a

- change example executable name. a.out => run - modify bad style of parenthesis.

Merge branch 'master' into dev/runtime/readimage

9e49ab2

tkng approved these changes Nov 26, 2019

View reviewed changes

tkng merged commit c7ea652 into blue-oil:master Nov 26, 2019

oatawa1 mentioned this pull request May 19, 2020

Add documentation about png usage in C++ runtime #1038

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added image reading function for runtime #577

Added image reading function for runtime #577

yoya commented Oct 30, 2019 •

edited

Loading

tkng left a comment

tkng commented Nov 22, 2019

tkng left a comment

tkng left a comment

Added image reading function for runtime #577

Added image reading function for runtime #577

Conversation

yoya commented Oct 30, 2019 • edited Loading

Motivation and Context

Description

How has this been tested?

Screenshots (if appropriate):

Types of changes

Checklist:

tkng left a comment

Choose a reason for hiding this comment

tkng commented Nov 22, 2019

tkng left a comment

Choose a reason for hiding this comment

tkng left a comment

Choose a reason for hiding this comment

yoya commented Oct 30, 2019 •

edited

Loading